* faces.el (x-resolve-font-name): Give correct error message

	 depending on whether or not FACE was non-nil.

diff --git a/lisp/faces.el b/lisp/faces.el
index 4b6d3812d2d9207da8458fafc22915334c7e5994..7788617ea2797631732f6652c88ea9f26f771de1 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -428,9 +428,9 @@ also the same size as FACE on FRAME."
       (let ((fonts (x-list-fonts pattern face frame)))
        (or fonts
            (if face
-               (error "no fonts match `%S'." pattern)
-             (error "no fonts matching pattern are the same size as `%s'."
-                    face)))
+               (error "no fonts matching pattern are the same size as `%s'."
+                      face)
+             (error "no fonts match `%S'." pattern)))
        (car fonts))
     (cdr (assq 'font (frame-parameters (selected-frame))))))